Merge Done 20-10-2014