Added login/logout/profile options
Merge remote-tracking branch 'upstream/master'