I have prepared new PR #12