Merge pull request #1 from swillits/master

Build and runtime fixes for OS X
another memory smasher fixed