Replaced dirty hack with clean solution
Merge pull request #1 from cookiemon/master

Replaced dirty hack with clean solution