Fixed #12 which also fixed #15.
Merge branch 'master' of github.com:/libris/librisxl