Added token and fixed specs #3