Minor updates, final version for workshop #1