minor bugfixes
Merge pull request #8 from Flipsels/master

Minor Bugfixes (Flipsels)