Merged master branch with testing branch