Merge branch 'master' of https://github.com/aubort/Matterhorn
Merge branch 'master' of https://github.com/aubort/Matterhorn

* 'master' of https://github.com/aubort/Matterhorn:
  Added some code