closes #511
Merge pull request #512 from Eye4web/session-fix

Session fix