Some changes
Changes to the class file

Add some method to the Processor class
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath