fixes
fixes
Merge branch 'master' of github.com:NinjaTux/maiordomus