Fixes #13
Merge pull request #14 from adaptlearning/issue/13

Fixes #13