Updated :gem:s
Merge back from master :rainbow: