Quick fixes, to merge two repos
Merge branch 'master' of https://github.com/JonBriggs/avatari