d12
Merge pull request #72 from barosl/d12

d12

Reviewed-by: barosl