Fixes the issues and updated the code

Fixes the issues and now committing the code
15-Nov-2014

Regards