Fixed issues found
Merge branch 'master' of https://github.com/jigarbjpatel/ItemTracker