changed some paths and library references
Merge remote-tracking branch 'origin/master'