Issue63

Fixes issue #63.