Updated to include validation
Merge origin/master