Pull from SOM-Cocoa
Merge branch 'master' of github.com:SoftwareMarbles/SOM