mehhh eh
meh
Merge pull request #3 from parinck/master

separation of concerns