Re-enabling OSX and bumping version
Merge branch 'hotfix/0.2.6'