better back traces
Merge branch 'dev' of https://github.com/changokun/m into dev

Conflicts:
	m.php