Merge pull request #2 from CliffordAnderson/master

Update
Merge pull request #43 from chrisbenda/master

Merge pull request #2 from CliffordAnderson/master