Duck class added
Merge branch 'integration'