session handler
Merge origin/master