Update to latest git
Add DMAP-3.0