Reviewed modified changes
Merge pull request #60 from tgtshanika/master

Fix for duplicate context by ThiliniS