Feature/#23

Fixes issue #23