Made changes to project as per GSoC application requirement

Tested and working