Closes #151
Merge pull request #221 from LearningLocker/develop

Closes #151