Fix syntax error. #22
Improve the way mappings are defined
Update docs