Using fetch instead of 5 line if statement
Merge pull request #326 from projecthydra/minor-refactor

Using fetch instead of 5 line if statement