Added static linking
Merge remote-tracking branch 'origin/master' into windows-build