Merge branch 'bug/107'