Merge with origin/master and having some new setter methods
Some testing changes - not done
Merge remote-tracking branch 'origin/master'