changes to 03, 05, 06, and 07
Merge pull request #1 from frankbi/master

changes to 03, 05, 06, and 07