Commit made by Ryan
Commit from Zacharias
Merge branch 'CommitsByMembers'