first revision
added my name to file [issue 53]
I added a hotfix phrase to the bottom.
merge conflict solved
second revision