DP: last minute bug fixes
Merge branch 'master' of https://github.com/rollis/DP.git