Fix #26
Merge pull request #27 from peey/master

Fix #26