KathyReid Merge pull request #525 from Arc676/crystalball