updates for the new master version
8 files changed