add package-dir
add package, version, requirement
Merge origin/master