changed logic around to make more sense when reading
Merge pull request #49 from misilot/patch-1

changed logic around to make more sense when reading