fixed some minor things
Merge branch 'master' of https://github.com/C291F14/C291A1
Merge pull request #11 from aktse/master

fixed stuff