Corrects bad revert #62 to initial correct merge #52

Fixes issue #45
Merge pull request #63 from willingc/revert-branch

Corrects bad revert #62 to initial correct merge #52