Misc Fixes
Merge branch 'master' of https://github.com/juliancruz87/Ataraxia
Merge branch 'master' of https://github.com/juliancruz87/Ataraxia