Merge pull request #12 from 30x/master

Fix bugs