Merge branch 'load_beerxml'