Improve usability of instance/mapper
Merge pull request #65 from pmerienne/improve_usability_of_instance

Improve usability of instance/mapper