enable session
Merge branch 'henryleu'