incorporated Carrie's suggestions
Nordman's suggestions
Merge pull request #1 from andeek/master

incorporated Carrie's suggestions