merge pull request #7 with correction