Issue 242

Issue #242