friend function implementation c++11 way
Merge branch 'release/1.0'