Merge branch 'master' of https://github.com/droderino/Alcomat
Merge remote-tracking branch 'alcomat/master'