Refactored formula + possibility of parametric
Merge remote-tracking branch 'origin/master'

Conflicts:
	WinPlotter/WinPlotter.vcxproj
	WinPlotter/WinPlotter.vcxproj.filters