Merge branch 'master' into John
added role identifier!
Merge pull request #3 from ksolkowski/John

John