Merge pull request #595 from ffainelli/stoken