Merge from optimized branch

Now we are working solely on the master branch