MacOSX Support and Fixes

Closes #16