Plenty of changes for #230
Merge branch 'master' of github.com:MisterTea/MAMEHub