Merge pull request #2 from gyanlon/branch1

merge them
Merge pull request #3 from gyanlon/master

Merge pull request #2 from gyanlon/branch1