Fixing issues found by WebStorm
Merge branch 'master' of github.com:kdzwinel/Context