d17
Merge pull request #77 from barosl/d17

d17

Reviewed-by: barosl