Added attribute mapping setting and general code improvements.
Increased version number.