Merge pull request #105 from stianst/master

KEYCLOAK-53
KEYCLOAK-105