Integrate changes and update default version

Hi,

this PR integrates the outstanding changes from @tisoft and @edlerd and adds a few touches of my own.

Regards, D.