implementation for #14

First pass for user comment