minor bug in assignment operator
Merging release into master.