These are changes cherry-picked from Ryan Ware

He's ECB repo: https://github.com/ware/ecb

It contains less commits, so it was easier to merge into your repo, than other way around. Now he just can fork your repo and make an official ECB.