issue #7 closed with this commit