Fixing issue 102

Fixes #102