Changes from #32 to #33

No changes in any of the builds.