Merge branch 'bug-120'