fixed some stuff
Merge pull request #2 from pfefferle/master

fixed some stuff