Update: pkgbuild
Fixed CMakeLists.txt and PKGBUILD
Fixed last commuit
Merge branch 'develop'