Fixes #43
Merge branch 'bug43'

Tested now.