merged updates from Scott
Merge pull request #1 from woodwarddesign/master

merged updates from Scott