Fixes #74, closes #74