Updated package info and readme
Merge
Merge branch 'server'
Revert "Merge"

This reverts commit bb24167256b9600be4be8309b79f933efa13b559.