updated to match Listing 2.1
Merge pull request #2 from flyinprogramer/master

updated to match Listing 2.1