Removed dist, had to merge from gh-pages
Macro functionality added