Meets functionality requested in issue #1