switching to delta eta + bug fixes
Merge pull request #18 from clandere/master

switching to delta eta + bug fixes