combined commit for issue #2