issue #2
Merge branch 'master' of ssh://github.com/mbreese/eta