Improved note, nw
Merge branch 'master' of https://github.com/mamedev/mame