SSO fix based on reverted master
indentation fix
Merge pull request #127 from Pomax/ssofix

SSO fix based on reverted master