Fixed Bugs
bug fixes
Merge pull request #34 from ellina-s/arjan

Arjan