issue #99 first commit