first part of fix
Merge branch 'SSO' of https://github.com/jintrone/XCoLab into SSO