Merge branch 'legacy' into master

Conflicts:
	.classpath
	README.txt