Fix bug introduced in last commit
Merge pull request #34 from lemurell/master

Fix bug introduced in last commit