Grading support

issue #76