Update views.py
Update views.py
Update variables.py
Update variables.py
Merge branch 'master' into hoyt