Adding @eteq to authors list
Merge branch 'master' into adaptive