DAO pattern 5
Merge origin/master