From Gradebook
Merge pull request #3 from mgshuster/master

From gradebook