Merge branch 'refs/heads/dev'

Conflicts:
	run.sh
	src/libstr.inc