Merge branch 'master' of github.com:bvanderveen/Thor
Merge branch 'master' of github.com:Adron/Thor
Merge pull request #192 from Adron/master

Minor fixes.