first commit
Merge https://github.com/respectotron/ecstatic