updated
Merge branch 'dist' of https://github.com/jroesch/dda into dist