Merge branch 'develop'
Document that this works on OSX