Fixes #50
Merge pull request #52 from adaptlearning/issues/50

Fixes #50