Merge pull request #6 from pthayer3/master

fixing my stuff