DAO pattern 3
Merge origin/master