Move start up timer for more accurate measurement
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Move start up timer for more accurate measurement

Conflicts:
	demo/demo.js