bug_fix
Merge branch 'master' of https://github.com/ferlzc/raspbeerdroid