[Minor] extend optimization
Merge pull request #168 from megawac/extend

[Minor] extend optimization