851

closes #851
@michaelDpierce and @duffcodester, and this