Fixed linker errors and the warning about the parse thread
Merge remote-tracking branch 'origin/master'
Delete should work
Merge remote-tracking branch 'origin/master'
Merge conflict