Fixes #77
Merge pull request #78 from adaptlearning/issue/77

Issue/77