DAOBase fixes
Merge branch 'master' of https://github.com/Ico91/Articles