Fixed timer issue with node and changed the name on the package.json
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json