Merge pull request #56 from subtly/develop

update for osx builds