Changes between #16 and #17

No changes in any of the builds.