Updated to work with Django 1.6 & Python 3.3