Merge pull request #216 from LearningLocker/master

Hot fixes from master to develop
Merge pull request #217 from LearningLocker/master

Hot fixes from master to develop
Updated readme and added contributors
Tweak
Merge pull request #218 from LearningLocker/develop

Update readme and contributors