Merge branch 'master' of https://github.com/mplatzer/BTYDplus
Merge branch 'master' of https://github.com/mplatzer/BTYDplus