d30
Merge pull request #83 from barosl/d30

d30

Reviewed-by: barosl