wrathematics Merge pull request #52 from snoweye/master