Updates for 11 June release
Merge pull request #18 from troycox/patch-7

Updates for 11 June release