Multiple bug fixes and improvements!
Merge branch 'master' of https://github.com/cshc/cshc_website