issue #37 was implemented