Closes #195
Fixes #214
Merge pull request #215 from LearningLocker/develop

Closes 195