beginning to work on the new algorithm
beginning to work on the new algorithm
Merge origin/master