Fixes #359.
Merge pull request #378 from LearningLocker/issue/359

Fixes #359.