Issue 106

Fixes issue #106.