fixes #1100
fixes #1064
Merge branch 'master' of github.com:r888888888/danbooru