Add support for contexts
Bump version