Added option to print 'grade category' grade
Merge branch 'master' into master_BFC