resolve #27
Revert "resolve #27"

This reverts commit 6b26bb69b34736a1789a101e4bf98cdf7f5e450a.
resolve #27 by switch the index order
resolve #31
Merge branch 'master' into dev/digest

Conflicts:
	DESCRIPTION