acumulative commit may 14
Merge branch 'master' of https://github.com/grawcho/CustomBuild