Merge pull request #7 from b79789/master

week2