Merge pull request !187 from Delusive/master
Merge pull request !180 from JOSWAY/master
Merge pull request !182 from sproutcat/master
Merge pull request !185 from asher/N/A
Merge pull request !184 from asher/N/A
Merge pull request !161 from 嘿白熊/master
