Initial commit with changes from original repo