merge

Merge 31/10/2014