fixes #224
Merge pull request #239 from LearningLocker/develop

fixes #224