Pull request 2335 - Addressing review comments from @galderz and @danberindei