Use Constructor factory

 On branch master

	modified:   index.js
	modified:   test/test.js