Merge pull request #1 from henriksen/develop

Develop
Added functionality to start support for OSX