fixed #114, more fixes in views.py to come