Bug fixes
Merge pull request #1 from Hellorin/master

Bug fixes