Closes #497
Fixes #498
Merge branch 'master' of github.com:whatifrussian/website