my name has been changed to Sam
Merge branch 'dev'