CODE COMMIT: June, 11 2014