bugfixes
Merge branch 'master' of github.com:yamins81/devthor
updates