minor stuff
resolved conflict
Merge branch 'master' of https://github.com/helloluis/customagic