Merge pull request #83 from candaya/master

here it is
Merge pull request #18 from IanJRigg/master

getting chris' changes
removed unnecessary variables and parameters
Merge pull request #84 from Ricky1833/master

Modified parameters and variables
added comments to header
Merge pull request #85 from Ricky1833/master

added comments to header
Merge pull request #30 from IanJRigg/master

got it