Merge pull request #9 from sharoonthomas/develop

Optimize to reduce database hits
Release version 3.2.0.3
Merge branch 'release/3.2.0.3' into develop
Handle NotFoundException safely