Merging fix for issue #136 into patch version 1.0.2