enabling optional context to make it work with modal windows
Merge pull request #18 from AlexCppns/master

enabling optional context to make it work with modal windows