Pull Request for Issue #79

Code corresponding with issue, simple bugfix.

Ignore the second commit, it was just reverting manage.py back to what it looks like in master, had a locally modified version that got picked up.