Merge custom changes
test commit
Only allow square images