Integrate suggestions from issue #60