Updated inline
Merge remote-tracking branch 'upstream/master'
Merge pull request #72 from jerv13/master

Updated inline