Merge branch 'fix-145'