enhancement #40 first commit