Merge pull request #2 from prakashpp/develop

Initial boilerplate #6381
WIP
Added functionality with tests