Merge pull request #140 from k45399735/master

一些改进