x
Merge pull request #50 from xxb123/master

Merge changes from xxb123.