Merge pull request #137 from timoberger/master

update master
Merge remote-tracking branch 'gggard/master'
Merge remote-tracking branch 'origin/master' into v1.9