Issue 248

Addresses issue #248