Merge pull request #16 from colincoghill/master

Assessment Bug Fix