Upgrade to v1.6

multiple small improvements
Merge pull request #28 from jslegers/master

Upgrade to v1.6