Merge pull request #834 from trylab/issue833