fixes #48  fixes #46
Merge branch 'master' of https://github.com/enwida/idpRepo