Please pull this

Changes till April 21st 2012