Fixes #235
Merge branch 'dev' of github.com:comic/comic-django into dev