Moved to remove "default package"
Added package name. Improved support for non-ASCII characters