RIAR-821
Merge remote-tracking branch 'upstream/master'
Merge pull request #31 from naveedhussain/master

RIAR-821