Merge pull request #1 from wrathematics/master

Updates
Merge pull request #2 from wrathematics/master

Updates
Merge pull request #10 from RBigData/master

Updates