Changes from #11 to #12

No changes in any of the builds.