Add support for OS X
Merge branch 'pullreq12' into hotfix/1.0.4
Bumped version number to 1.0.4
Merge branch 'hotfix/1.0.4'