Changes from #43 to #44

No changes in any of the builds.