Merge pull request #21 from claco/grizzly

Merged automatically by jenkins after successful build test
Corrects Dpkg options used.
Merge pull request #22 from git-harry/grizzly

Merged automatically by jenkins after successful build test