a change to the interface
Merge branch 'issue2'