Updated plugin macros as per issue #7.