Fixes #17
Merge pull request #18 from adaptlearning/issue/17

Fixes #17