Fixed Areas to not alter the original
Merge remote-tracking branch 'origin/master'