updated package.son, merged change