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

Fixes #16