Modern objective-c
Merge pull request #629 from wmathurin/modern_objective_c

Modern objective-c (used the Xcode menu to convert over code)