Feature/django 16

Fix #19 
Fix #9