Added sdpkg command and merge from upstream