Fixed several errors
Merge pull request #1 from Dasister/master

Fixed several errors