Now with some tests
Merge branch 'master' of https://github.com/grill/vindaloo
Merge branch 'master' of https://github.com/grill/vindaloo