Merge pull request #64 from ellemot/master

Migrating Lee's Styling Changes
Merge pull request #66 from ellemot/hotfix-110514

cache
Merge pull request #67 from ellemot/master

Merge pull request #65 from ellemot/hotfix-110514
committing styling changes
Merge pull request #69 from ellemot/styling2

committing styling changes
Merge pull request #71 from ellemot/development

Migrating Lee's Styling Changes