Changes between #187 and #224

No builds.