For work on Server
Merge branch 'master' of github.com:advsm/pamm-start