issue #41 done