Issue #1006 + other fixes
Tweaks
Issue #1019
Readme and version number