Optimize to reduce database hits
Merge pull request #9 from sharoonthomas/develop

Optimize to reduce database hits