added changes from test on server nodes
Merge branch 'master' of https://github.com/mwalzer/Fred2