Changes from #31 to #32

No changes in any of the builds.