fixes #10
rebased onto 1462d9e247348ee6676efb0fcfe30a66720b6e77
Pull-Request has been merged by lrossett
fixes #10
Changes