Merge pull request #1555 from falzm/extend-interface