Django 1.7 compatibilty #52 

Solves Issue 2