Merge pull request #2 from wrathematics/master

Updates