Enable the possiblity of adding complex mappings
cleanup
Merge pull request #11 from massiveart/complex_data

Enable the possiblity of adding complex mappings