Issue133

Fixes #133