Merge pull request #572 from jialinsun/master

	load data in update thread instead of init thread