Fix context issues. Fixes #16
Merge branch 'release'