Issue132

Fixes #132