Clean code
Merge branch 'master', remote-tracking branch 'fork/master'

Conflicts:
	src/robot.impl.cc