Cleaning up dup line from Issue #6
Merge remote-tracking branch 'origin/master' into configuration

Conflicts:
	index.js