Merge branch 'ivanify'

Merging changes, since the tests also work on OSX

Fixes #2