Try to implement more package handling
Merge pull request #108 from miska/master

Try to implement more package handling