merging my code with the joshua projects changes. Then merging it to the master branch.