PR for issue #748
Merge pull request #1036 from Areloch/Issue_748

PR for issue #748