Cleanup lib - compilation error exists.
Merge remote-tracking branch 'origin/master'