made things work on the pr3
Merge remote-tracking branch 'henry/master'
automatically add to master file