Manual merge with master
Manual merge with master
Add in inlineRich
Merge pull request #92 from morgante/master

Merge pull request #11 from jakiestfu/master
Merge pull request #12 from jakiestfu/master

Upstream