Fixed broken samples and readme wrt macros, which need to be surrounded by curly braces.