fixed several errors
Merge pull request #3 from MikeESL/master

fixed several errors