adjustments to packaging.
Merge branch 'release/v0.1.4'