Merge branch 'fix/45'