Merge branch 'issue/128'