Create separate package, fix warning and other basic issues.
Merge pull request #1079 from tweise/hds

Create separate package, fix warning and other basic issues.