use built-in logout handler
Merge branch 'dev'