*Always* use the ContextResolver when loading options
Version Bump to 2.1.0