Testing fix for issue #29
merging with GitHub changes