Bootstrap macros

done #21