amendments3
Merge remote-tracking branch 'Edwardo2014/master'