Fixes #180
Merge pull request #188 from LearningLocker/develop

Fixes #180