Bugfix
Merge pull request #19 from Novatux/master

Bugfix