Merge pull request #1 from westover/master

Merging
Merge pull request #4 from orlandopython/master

Merge pull request #1 from westover/master