Pull request for Issue #148