improved mapping function
README adjusted