Merge branch 'release'
Updated plotters
Merge branch 'master' into new_build
Build sucessfully refactored.
Clean commit...
Merge branch 'new_build' into release