committing the completed version (with changes)
Merge remote-tracking branch 'origin/master'