Fixes issue #15
Fixes issue #16