MOD: small algorithm changes
MERGE: Merge branch 'master' of github.com:izzycecil/Paratype