Merge Done 22-10-2014