Some improvements
Merge branch 'master' of https://github.com/Ph3nol/OSX-DevEnv
Some improvements