Merge pull request #1109 from adbre/iss358