Fixes #165
Fixes #144
Replacing missing closing bracket
Merge pull request #166 from LearningLocker/develop

Bug fixes