Merge pull request #17 from jontsai/master

changed cache to use NSCache
basic formatting stuff
resolved conflicts
Merge pull request #18 from grcdeepak1/master

Formatted date :)