Signed-off-by: hozwe
Merge branch 'master' of ssh://git@github.com/hozwe/module-js.git

Conflicts:
	module.js