improve performance
Merge pull request #17 from bsuh/master

improve performance