addressed review issue, see #32