Merge pull request #51 from CrossStream/sandbox/rzr/review/master