Final changes to resolve current merge conflict status of original Sierpinski project repo.