improve code efficiency
Merge pull request #2 from sunaiwen/improve_efficiency

improve code efficiency
Merge branch 'master' into gh-pages

Conflicts:
	tests/test.js
	tests/testBuild.js