use a GuardClause
use 'or' rather than '||'
Merge pull request #60 from delba/guardclause

use a GuardClause