Big fix for context creation bug.
Version update.
Merge branch 'dev'