Fixing packages connection
Merge origin/master