Merge pull request #5 from pkkup/master

update to work with Django 1.6.2