Fix type issue for OS X
Merge branch 'master' of github.com:stagebloc/CocoaBloc