FEEDBACK PLS
the feedbach
Merge pull request #10 from clemtine/branch-chris

Feedback into master!