Fixed errors
Merge pull request #216 from pachalad/master

Fixed errors