Issue/16

Fixes #16