Mavericks fixes
Merge branch 'master' of https://github.com/enigma-dev/enigma-dev