master base pull request

look at the very important piece of code!