Issues #123 and #82

Issue #123 is complete. Issue #82 is complete but requires further
testing.
Merge branch 'master' of https://github.com/iambillmccann/PrescienceRx