Merge pull request #801 from TheAngularity/patch-2