4/enh part 1
Merge pull request #831 from abhinavc/master

4/enh part 1