First commit
Merge https://github.com/bachmac/bach-test