Fixes #26
Merge pull request #27 from adaptlearning/issue/26

Fixes #26