Optimize.
Merge branch 'master' of github.com:ggreer/the_silver_searcher