Merge pull request #4 from lat-lon/reworked-ets

Merge PR4 from lat-lon:reworked-ets