Method error due to xerces
Updated the build to make it more useful
Merge remote-tracking branch 'origin/master'

Conflicts:
	run.sh