Changes from #42 to #43

No changes in any of the builds.