Merge pull request #2 from feuerbach/master

Update to work with tasty-0.5
Update to work with tasty-0.7