Fix #181
Fix #180
Merge pull request #183 from seaweedchan/4chanX

Fix #181 and #180