Minor changes to build on OSX.
Fixed fs, fe macros to work on OSX and Linux.
Merge pull request #25 from cseed/master

Changes to build on OSX