Nonesuch credits + Horsepill Fixes
Merge branch 'master' of https://github.com/Fenoxo/sourceTiTS