iteration 4
Merge pull request #3 from dominic0312/master

iteration 4