Merge pull request #15 from LearningLocker/master

update from upstream
Fix https://github.com/LearningLocker/learninglocker/issues/289
Merge pull request #308 from garemoko/master

Fixes https://github.com/LearningLocker/learninglocker/issues/289