Added Contributino edition: implementation and unit testing