Issue 5

Fixes issue #5