updating
Merge pull request #251 from atomical/task/update-avalon-felix-matterhorn

updating matterhorn