Fixes to unstable package
Merge pull request #61 from khawkins/fix_unstable_package

Fixes to unstable package