Add kim and ylmaz and fix a session error
Merge branch 'session.error'