Changes between #17 and #18

No changes in any of the builds.