added the fixes from package-template #39