Improvements on package load (Issue#15)