django 1.4+ compat
Merge pull request #6 from vosi/master

django 1.4+ compat