most of roger
Merge branch 'master' of https://github.com/TheGreekBrit/YoshiDis