Implemented translation, not tested.
Merge branch 'Exercise16' into development

Conflicts:
	src/test.cpp
Merge branch 'development'