some fix
Merge branch 'buggy' of github.com:ywangd/stash into buggy

Conflicts:
	shruntime.py