Initial commit HERMES
Merge origin/master