Merge pull request #620 from Grunthos/master

Updates and merges
Merge github.com:eleybourn/Book-Catalogue