Merge with last commits from : https://github.com/len/Mathematics/commits/master since April 17, 2019