Brought in changes from github