Refactor.
Merge remote-tracking branch 'origin/master'

Conflicts:
	module/service/service.js