Merge pull request #530 from rdsubhas/master

Cleanup | Work In Progress