Fixing #1
Merge pull request #2 from tvillaren/master

Fixing #1