Configuration
Merge branch 'master' of https://github.com/TroyPlus/TroyPlus.git