Merge remote-tracking branch 'origin/master'

Conflicts:
	_cache
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 47b7c8df95074a6ab527cf9e5bd435d5751cd108.
add warnings
fix bug