Merge pull request #15 from samuelyuri/hotfix/issue#3

Hotfix/issue#3
Merge branch 'hotfix/issue#3' into develop
Merge branch 'develop' of https://github.com/samuelyuri/eduqiservice into develop
Merge pull request #16 from samuelyuri/develop

Develop