Pull request for issue #14

As in Issue #14 and some minor pep8 formatting,

Can you test it since I didn't managed to start jukebox (bin/jukebox jukebox_setup there is no local auth)