improve performance
Merge pull request #41 from koboshi/develop

improve performance