added diskspace information to service info (inspired by samans
approach, but differently implemented)
uh-oh fix
Merge remote-tracking branch 'origin/master'