started to check how we can improve handling of nested macros
refactored the header file and parser
Merge branch 'develop'

* develop:
  refactored the header file and parser
  started to check how we can improve handling of nested macros

Conflicts:
	labs/nesting_macros_test.c