Contribs to #172