Added extra package installs
More fixes
Merge pull request #2 from ghartnett/patch-2

Patch 2