Possibly more robust
Merge branch 'master' of git://github.com/seplogic/jstar

Conflicts:
	scripts/run.sh
Merge branch 'master' of github.com:seplogic/jstar into alt-abd