Fixed #8
Fixed #7
Merge pull request #9 from oncode/master

Bugfixing