Merge pull request #1 from snoweye/master

joining delta eta
Merge pull request #20 from ozway/master

Merge pull request #1 from snoweye/master
Merge pull request #2 from snoweye/master

merging some from clandere