Fixed #19
Merge pull request #20 from marcuskrantz/master

Fixed #19