Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
fixed path to static libs
Merge pull request #67 from retuxx/project

Fixed path to static libs