Using sam and no folders operations
Merge remote-tracking branch 'origin/master'