Fix #5; Fix #7.
Fix #5; Fix #7.

Power-Inside/django-frontend,Power-Inside/django-frontend,jonfaustman/django-frontend,Power-Inside/django-frontend,jonfaustman/django-frontend,jonfaustman/django-frontend