merge with master
Changes done
Merge with github
Combine paperclip and rich test