adding some stuff from Dane
Merge branch 'master' into Servers