Update issue 236

(cherry picked from telscale commit fd8ec2be4bf9fbe27c997beda885fdaa83632463)

Conflicts:
	.classpath