Prepare for 1.6.0
Merge pull request #145 from bbeck/master

Prepare for version 1.6.0