Issue133

Fixes issue #133