Merge pull request #8 from IanJRigg/master

getting Riggins updates
adding updates
Merge pull request #28 from candaya/master

merging additions to .cc