MOD: refactoring the main file.
MERGE: Merge branch 'master' of github.com:izzycecil/Paratype