proposal #2 for issue #9

Proposal #2 for issue #9