Release: merge develop into master#161

AndrewSazonov merged 2 commits intomastereasyscience/diffraction-lib:masterfrom

developeasyscience/diffraction-lib:developCopy head branch name to clipboard