Merge pull request #55 from biergaizi/master