addressed review issues, see #32