changes
Merge branch 'feature/1236_test_macros2' into develop

Conflicts:
	README.md