Improvements
Extra fixes
Merge pull request #782 from lexware/master

Improvements