Fixes for latest jmacro
Merge pull request #73 from A1kmm/master

Fix build following latest changes to jmacro