Merge branch 'master' of github.com:bvanderveen/Thor
Merge branch 'master' of github.com:Adron/Thor