Fix #878, 880
Merge branch 'master' of github.com:MayhemYDG/4chan-x