better handling of server environment
Merge branch 'master' of github.com:marcellmars/letssharebooks