Merge pull request #24 from throrin19/release/1.7.0

Release/1.7.0
 Use & in order to evaluate both side of the operation. Fix test.
Merge pull request #25 from piobab/fixes

 Use & in order to evaluate both side of the operation. Fix test.