MOD: Refactored.
Merge branch 'master' of github.com:izzycecil/Paratype