merge of files from TTH
Merge branch 'master' of https://github.com/bellcom/valhalla