More Mac fixes
Merge branch 'master' of https://github.com/wiehan-a/spectral-toolkit.git