Added Native Libs
Merge branch 'master' into dev