Merging master of github branch in, and fixing gauge behavior so I can specify the sample rate.