updating my repository after merge 2 (04-09-2014)