Merge pull request #22 from branzhu/master