Fix #12
Fix #14
Merge pull request #13 from rlouapre/master

Fix #12- Fixed for using various map keys to represent content