Merge pull request #131 from shalabhaggarwal/develop

Handle context gracefully fixes #123
Handle procure_method to be made extensible