Refactor using modern objective-c syntax
Refactor using modern objective-c syntax for OSX part
Merge pull request #137 from x2on/modern-objective-c-syntax

* Refactor using modern objective-c syntax
* Fixes #131