Added plot macros
Merge branch 'top'