added PKGBUILD changes from develop-serverless
simplified version number
merged changes from develop