Bugfix
Merge branch 'master' of github.com:sam101/scan-and-share-server