Changes between #15 and #16

No changes in any of the builds.