First passing spec
Merge pull request #1 from basvodde/master

First passing spec