Take operator args by const&
Merged branch master