Fixes #53
Merge pull request #54 from adaptlearning/issues/53

Fixes #53