Dao #12

Closed
pfk4vawr6 wants to merge 6 commits from pfk4vawr6/ssm:master into master