Refresh tokens at beginning
Merge branch 'master' into bug-400

Conflicts:
	lib/index.js