Issue/#95

Fixes #95