Merge branch 'release/0.2.1' into develop
Added OSX-Example.
Merge branch 'develop'