Issue 492

Addresses #492