Fixed #131: Compiles on OS X now.
Clarify comment about typedef for OSX compiling
Merge branch 'pr138'