Merge pull request #1470 from ssushma/dev-branch

Hewlett tracking implemented
null pointer issue fixed for review