Merge branch 'mainini-issue-1'