Fixing issue #146
Merging fix for issue #136 into patch version 1.0.2
Bumping version number, 1.0.2
Backporting issue #111 to hotfix 1.0.2
ooops forgot a space\!
Merging 1.0.2 for release