Editted
Merge branch 'master' of github.com:simonvh/fluff