added E to the master in amarini
added F to the master
Merge remote-tracking branch 'upstream/master'