Fixes #164
Merge pull request #167 from LearningLocker/develop

Fixes #164