Assignment 03 + 04
Merge pull request #3 from jt-tw/assignment03

Assignment 03 + 04