Merge branch 'issue124'