Merge remote-tracking branch 'origin/feature/1655_number3'
More changes
Merge branch 'feature/1234_test_macros' into develop

Conflicts:
	README.md