Merge pull request #1 from bpbond/master

updates
Merge pull request #3 from cahartin/master

Merge pull request #1 from bpbond/master