Pull request for issue/529

This is a pull request related to issue 529