Add method foo
Merge branch 'dev'