Updated to fix issue #17
Merge pull request #19 from adaptlearning/issue/#17

Updated to fix issue #17
Merge branch 'develop'

* develop:
  Updated to fix issue #17