Fixed a few errors
Merge pull request #169 from bvssvni/master

Fixed a few errors