classify.py update, added macros
Merge remote branch 'jgonski/master'