Resolves #927 . Commit requires testing.
Solved merge