Trying to fix #157.
Merge branch 'upload' of github.com:peerlibrary/peerlibrary into upload