Merge pull request #28 from amrael/django18_2