Merge pull request #2 from lbarstow/master

Merge 2
Merge with.
Merge pull request #3 from hjfender/master

merge