Merging changes from oreGen branch