Implement class
Merge branch 'dev'