Fixed import
Fix for go1
Merge remote-tracking branch 'origin/master' into pull

Conflicts:
	router.go