issue #35 was implemented