Merge pull request #23 from COSI236TA/session_bug

really fix the problem
fix problems in session control and helper