Merge pull request #3 from CliffordAnderson/master

Update
Merge pull request #61 from chrisbenda/master

Merge pull request #3 from CliffordAnderson/master