Consistency
Merge pull request #168 from seaweedchan/master

Consistency