Merge pull request #1 from jimdowling/master

RmPeerInit renamed
Fixes the incorrect calculation of resource usage details.
Merge pull request #2 from ali-dar/Sparrow

Sparrow
Merge remote-tracking branch 'upstream/master'