Closes #18
Merge pull request #50 from IPA-Lets-Study-Together/dev

Closes #18