incorporated feedback for issue #24