Cleaner macro tricks
Merge branch 'master' of https://github.com/r-lyeh/knot into HEAD

Conflicts:
	knot.cpp