Fix issues with package (Ref #12)
Merge pull request #13 from reinetwork/ticket_12

Closes #12