Merge pull request #6 from lightszero/master

Merge master code.