Merge Test and Master together

Merging commits.