Merge pull request #164 from seaweedchan/master

Fix #163