still debugging
Merge pull request #67 from cfinn2010/master

still debugging