Fixes #5 see issue for more details
Merge branch 'master' into randomuser/issue5
mend