Fixed linker error
\
Merge remote-tracking branch 'GITHUB/master'