Added MAIN-tag
Merge remote-tracking branch 'hoffman/master' into merge-patches

Conflicts:
	src/attrdict.c