Merge pull request #16 from adaptlearning/develop

Develop
fixed issue 17
Merge pull request #18 from adaptlearning/issue/17

Issue/17