Converted from using namedtuples for measurements to using
hierarchical column names #128 #122