first commit
Merge https://github.com/tweyforth/ETC