Issue #35: updates based on comments