django 1.6
Merge pull request #31 from jayfk/master

django 1.6