Merge branch 'master' of https://github.com/munchys/biblio.git