update methods in class configuration.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client.java