Refactor using modern objective-c syntax
Fix iOS Tests
Refactor using modern objective-c syntax for OSX part
Merge pull request #138 from x2on/test-fix

Fix iOS Tests
Set correct deployment target for mac os x
Set correct deployment target for mac os x
Merge pull request #137 from x2on/modern-objective-c-syntax

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