Merge pull request #710 from TheAngularity/master