Fixed rebase issues
Merge pull request #65 from cachethq/elliotfehr-master

Fixed rebase issues