some arrange
Merge pull request #1 from kybin/master

some arrange