Merge pull request #2 from wrathematics/master

Updates
Merge pull request #3 from wrathematics/master

Updates
Merge pull request #19 from RBigData/master

Updates