Feature/issue 269 persist cookie