Revert "Revert "Merge pull request #293 from pgreyson/master""

This reverts commit 6deae1d3651995473ac2e7877d28f6ef7abd4e16.
5 files changed