paperclip gem
Merge commit