Feature/28

Fixes #28