little optimization
Merge branch 'issue4' of https://github.com/devstarter/ii into issue4
test