Add context strategy option
Bump the version to v0.3.1