Gyouho's machine 140722
Merge branch 'master' of https://github.com/lab11/M-ulator