Bug fix
Merge pull request #28 from eheien/master

Bug fix