Merge pull request #38 from ConceptFirst/master

Adding overloads to metric factory methods to take context where missing