fixed errors from my previous commit
Merge pull request #84 from pehcha/master

Fixed errors from my previous commit