Fixes according to comments
Merge branch 't9_django_command'. With changes according to comments.