Updated to latest commit from master