Avoid adding the same package twice, use TrimStart instead of substri…

Avoid adding the same package twice, use TrimStart instead of substri… #51