Merge pull request #1 from sympy/master