Merge pull request #1 from hpcc-systems/master

Merge pull request #2 from dineshshetye/master