Squash merge from newfeature to Master Branch
squash done