Fix last commit
Fix last commit

See #281, #284 and #285.

johndeeney/pianobar,gnowxilef/pianobar,tchajed/pianobar,DavidZemon/pianobar,johnso51/pianobar,johndeeney/pianobar,gnowxilef/pianobar,johndeeney/pianobar,johnso51/pianobar,bmbove/pianobar-save,DavidZemon/pianobar,tchajed/pianobar,tchajed/pianobar,gnowxilef/pianobar,twahlfeld/pianobar,johndeeney/pianobar,bmbove/pianobar-save,johnso51/pianobar,johnso51/pianobar,tchajed/pianobar,DavidZemon/pianobar,johndeeney/pianobar,twahlfeld/pianobar,tchajed/pianobar,DavidZemon/pianobar,johnso51/pianobar,gnowxilef/pianobar,gnowxilef/pianobar,gnowxilef/pianobar,DavidZemon/pianobar,twahlfeld/pianobar,johndeeney/pianobar,tchajed/pianobar,johnso51/pianobar,twahlfeld/pianobar,bmbove/pianobar-save,bmbove/pianobar-save,DavidZemon/pianobar,bmbove/pianobar-save,twahlfeld/pianobar,twahlfeld/pianobar