updated huskey
updated husky
merged with develop