Resolves issue 857.
rebased onto a6e54e0bb2d9ad7db60d1ebe5dee99f33c5a8980
Thank you!
Pull-Request has been merged by pbokoc
Resolves issue 857.