updated dao
Merge branch 'master' into daofuture