refactor to reflect logic on line 62
Merge pull request #637 from Roland1975/gh-pages

refactor to reflect logic on line 62