improve for performance
Merge #41 r=@johnnyman727: improve for performance