Fixes for version 0.0.4, tested with django's unit tests