fix
Merge branch 'develop' of https://github.com/phi1618/tmlib.js into develop

Conflicts:
	build/tmlib.min.js