optimize
Merge pull request #31 from jzelenkov/master

optimize