Fixed unresolved external
Merge branch 'David'