Solves Issue 2 from #55
Merge pull request #55 from jordanorc/master

Django 1.7 compatibilty #52