Merge branch 'martindiphoorn-master'
See comments for pull request #51