changes
Merge remote-tracking branch 'origin/feature/1236_test_macros2'

Conflicts:
	README.md