d20
Merge pull request #80 from barosl/d20

d20

Reviewed-by: barosl