Added tests related to issue #21
Fixes issue #20
Version 0.2.3