- no need for that if condition, results in needless tight coupling
Merge pull request #468 from adamarla/master

- no need for that if condition, results in needless tight coupling