v0.4
Merge branch 'dotm'