fixed some bugs
fixed some bugs
Merge pull request #1 from janoliver/master

some changes