fix for FB-254

Just one class registration is sufficient.
Use OSX-SDK on Mac OSX 10.9
Merge pull request #127 from scunz/fix_osx109_build

Use OSX-SDK on Mac OSX 10.9
Merge pull request #128 from dougma/FB-254

fix for FB-254
Merge remote-tracking branch 'upstream/master'