fix conflict
My third commit
Master commit
Merge branch 'issue124'
Merge remote-tracking branch 'origin'