Merge pull request #27 from amrael/django18