Merge pull request #1 from CliffordAnderson/master

Updating
Merge pull request #49 from dlilton/master

Merge pull request #1 from CliffordAnderson/master