* Issue #119 fix.
Merge branch 'master' of github.com:Schumix/Schumix2