Merge pull request #4 from lightszero/master

Merge master code.