Bug in assignment operators is fixed
Merge branch 'master' into argparser

Conflicts:
	tests/CMakeLists.txt