remove trash
Merge branch 'master' of github.com:poma/controld
revert revert