Merging
Merge branch 'master' of https://github.com/Mimis/herodotus

Merging
message
new mapping