Assigment III
Some improvements.
Merge pull request #1 from Foriger/Stanford

Stanford