07/08/14

Updates as requested from meeting 07/08/2014