Dana's Corrected Changes
Merge pull request #27 from danaw/master

Dana's Corrected Changes