Updated master branch with Kevin's code and November's code