probable fix for linking issues plaguing everyone
Merge remote-tracking branch 'origin'