Cool new macro and new example, better docs, bugfixes
merge
What am I doing wrong with git??