minor updates to pull#17
2 files changed