Pull request for issue #52

Linking to issue #52