merge1 - 07/07/2014