Merge pull request #1 from allenarthurgay/customize

Customize
Merge branch 'master' into customize