Committing so I can get changes
Merge remote-tracking branch 'origin/master'
To get the code into GitHub