Merge branch 'master'

Conflicts:
	service/hmac.go
	service/router.go
	service/service_test.go