'login_redirect' branch

Working on issue #24