Geometry; a modern introduction