FIx package issue
Small fixes
Merge pull request #16 from DanNixon/pkg2

Package fix