Fixed unresolved external
Merge branch 'David'
Merge branch 'master'