Sample resolve added for issue #22