Incorporate bug fix and more M-O layouts.  Thanks to smeagol74@gmail.com