DAO fixes
Merge branch 'master' of https://github.com/Indigerd/Asgard