fixes
Merge branch 'master' of https://github.com/sheehamj13/mrs-cunningham