Commit 0.8.1

from dm-dev