Merge pull request #3 from pthayer3/master

fixing my fork