first pass at P000197, #225
Merge pull request #626 from ahdinosaur/patch-1

First pass at P000197, #225