#837
Merge pull request #851 from theannielin/stable

Resolves #837