LICENSE added + minor macros refactoring