minor changes after roberto's review
macro.h added