Completed packaging support, should solve #3.