feature describe in issue #82

fixes #82