Third iteration
Merge pull request #3 from Coenego/iteration-3

Third iteration