Issue 102

This should close issue #102