Got rid of macros.h
Merge branch 'V1'