Fix/42

Fixes issue #42