Uid gid

Updates corresponding to feature request #13