corrected some mistakes
Merge pull request #20 from korpling/develop

corrected some mistakes