Move session token check
Merge pull request #98 from wilsonge/development

Move session token check