Some more work
Merge branch 'master' of github.com:toumorokoshi/miura

Conflicts:
	miura/runner.py