merging pull request #4 (manually resolved)