Few rearrangements and some tollerance improvements
Few rearrangements and some tollerance improvements
Merge branch 'master' into testing