Merge pull request #613 from JudahGabriel