Changes from #15 to #40

No changes in any of the builds.