Merge pull request #622 from JoesephPaulSmith/master