Merge pull request #1 from zgolman/samantha

Samantha
Merge pull request #2 from zgolman/samantha

Samantha
Merge pull request #3 from zgolman/backend

Backend
Merge branch 'master' of https://github.com/zgolman/yabe into backend