Update source code 01-July-2014