Perfectionist updates
Merge origin/master into database