Fix issue #19
Merge pull request #21 from bjornsnoen/master

Fix issue #19