Fix for issue #9
Merge pull request #10 from adaptlearning/issue/#9

Issue/#9