Issue 129

Implementation for issue #129 (revised)