Add guard statements
Merge remote branch 'origin/master'