Issue #178 + minor optimizations
Using new minor version number 0.9.0 instead of 0.8.3 to prevent update issues
Merge pull request #215 from wagnert/master

Issue #178 + minor optimizations