First commit from solomax fork