Commit by Dhanish -- 19/11/2014