Synched up with the lastest private git 13th Sept 2013