Merge pull request #3 from IanJRigg/master

getting latest
Made changes per Riggins instruction
Merge pull request #27 from Ricky1833/master

adding changes made to .cc and .h