First commit - first draft
Merge branch 'master' of https://github.com/alemser/etx
Merge changes to git