Paul branch

Im merging again, or atleast sending a Paul(pull) request.