Got the problem fixed for the powers of 2, I hope
Trying to push this again
Merge branch 'origin/master'
One more time trying this