Manually merged patch 2 into the most recent state.
Merge pull request #4 from wibeasley/patch-4

Manually merged patch 2 into the most recent state.