Revert "Revert "Merge pull request #193 from archgrove/master""

This reverts commit 7e26a5626f8a7a58ca8243774dde8adf57098755.