fixed some bugs
Merge pull request #9 from SaschaSanJuan/bugfixes

fixed some bugs