Fixes #3
Code tidy
Merge pull request #4 from adaptlearning/issue/3

Fixes #3