master commit
this is samy commit
Merge branch 'samy'