Merge branches 'master', 'py3' and 'master' of https://github.com/JoeyJo0/williewortel