commit from ex 1 and ex 2 from gerwin
Merge pull request #9 from gerwinnor/master

commit from ex 1 and ex 2 from gerwin