cleaning up
Merge https://github.com/izebb/ex