Merge remote-tracking branch 'henry/master'
automatically add to master file
merged with john