Issue 138

Fixes #138 once merged.