moar feedback.
Merge pull request #11 from clemtine/branch-chris

moar feedback.