Fixed clyde
Merge branch 'master'